Skip to content

Commit cf98c92

Browse files
mkaplymkaply
authored
Merge pull request #1191 from mozilla/InterceptionPoints
Add InterceptionPoints
2 parents 28d9f3f + 3481700 commit cf98c92

File tree

6 files changed

+80
-20
lines changed

6 files changed

+80
-20
lines changed

‎docs/index.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1379,31 +1379,31 @@ Value (string):
13791379
```
13801380
OMA-URI:
13811381
```
1382-
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis/ContentAnalysis_InterceptionPoints_Clipboard_Enabled
1382+
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_Clipboard
13831383
```
13841384
Value (string):
13851385
```
13861386
<enabled/> or <disabled/>
13871387
```
13881388
OMA-URI:
13891389
```
1390-
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis/ContentAnalysis_InterceptionPoints_DragAndDrop_Enabled
1390+
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_DragAndDrop
13911391
```
13921392
Value (string):
13931393
```
13941394
<enabled/> or <disabled/>
13951395
```
13961396
OMA-URI:
13971397
```
1398-
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis/ContentAnalysis_InterceptionPoints_FileUpload_Enabled
1398+
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_FileUpload
13991399
```
14001400
Value (string):
14011401
```
14021402
<enabled/> or <disabled/>
14031403
```
14041404
OMA-URI:
14051405
```
1406-
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis/ContentAnalysis_InterceptionPoints_Print_Enabled
1406+
./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_Print
14071407
```
14081408
Value (string):
14091409
```

‎windows/de-DE/firefox.adml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<string id="SUPPORTED_FF130">Firefox 130 oder höher, Firefox 128.2 ESR oder höher</string>
7676
<string id="SUPPORTED_FF130_ONLY">Firefox 130 oder höher</string>
7777
<string id="SUPPORTED_FF131">Firefox 131 oder höher, Firefox 128.3 ESR oder höhe</string>
78-
<string id="SUPPORTED_FF136_ONLY">Firefox 136 oder höher</string>
78+
<string id="SUPPORTED_FF137_ONLY">Firefox 137 oder höher</string>
7979
<string id="firefox">Firefox</string>
8080
<string id="Permissions_group">Berechtigungen</string>
8181
<string id="Camera_group">Kamera</string>

‎windows/en-US/firefox.adml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<string id="SUPPORTED_FF130">Firefox 130 or later, Firefox 128.2 ESR or later</string>
7676
<string id="SUPPORTED_FF130_ONLY">Firefox 130 or later</string>
7777
<string id="SUPPORTED_FF131">Firefox 131 or later, Firefox 128.3 ESR or later</string>
78-
<string id="SUPPORTED_FF136_ONLY">Firefox 136 or later</string>
78+
<string id="SUPPORTED_FF137_ONLY">Firefox 137 or later</string>
7979
<string id="firefox">Firefox</string>
8080
<string id="Permissions_group">Permissions</string>
8181
<string id="Camera_group">Camera</string>
@@ -104,6 +104,7 @@
104104
<string id="SecurityDevices_group">Security Devices</string>
105105
<string id="FirefoxSuggest_group">Firefox Suggest (US only)</string>
106106
<string id="ContentAnalysis_group">Content Analysis (DLP)</string>
107+
<string id="InterceptionPoints_group">Interception Points</string>
107108
<string id="Allow">Allowed Sites</string>
108109
<string id="AllowSession">Allowed Sites (Session Only)</string>
109110
<string id="Block">Blocked Sites</string>
@@ -1184,6 +1185,22 @@ If this policy is disabled or not configured, the default pipe name of 'path_use
11841185
<string id="ContentAnalysis_ShowBlockedResult_Explain">If this policy is disabled, Firefox will not show a notification when a DLP request is denied.
11851186

11861187
If this policy is enabled or not configured, Firefox will show a notification when a DLP request is denied.</string>
1188+
<string id="ContentAnalysis_InterceptionPoints_Clipboard">Clipboard</string>
1189+
<string id="ContentAnalysis_InterceptionPoints_Clipboard_Explain">If this policy is disabled, clipboard operations will not use DLP.
1190+
1191+
If this policy is enabled or not configured, clipboard operations will use DLP.</string>
1192+
<string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Drag And Drop</string>
1193+
<string id="ContentAnalysis_InterceptionPoints_DragAndDrop_Explain">If this policy is disabled, drag and drop operations will not use DLP.
1194+
1195+
If this policy is enabled or not configured, drag and drop operations will use DLP.</string>
1196+
<string id="ContentAnalysis_InterceptionPoints_FileUpload">File Upload</string>
1197+
<string id="ContentAnalysis_InterceptionPoints_FileUpload_Explain">If this policy is disabled, file upload operations will not use DLP.
1198+
1199+
If this policy is enabled or not configured, file upload operations will use DLP.</string>
1200+
<string id="ContentAnalysis_InterceptionPoints_Print">Print</string>
1201+
<string id="ContentAnalysis_InterceptionPoints_Print_Explain">If this policy is disabled, print operations will not use DLP.
1202+
1203+
If this policy is enabled or not configured, print operations will use DLP.</string>
11871204
<string id="Preferences_Boolean_Explain">If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
11881205

11891206
For a description of the preference, see:

‎windows/firefox.admx

Lines changed: 55 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<definition name="SUPPORTED_FF130" displayName="$(string.SUPPORTED_FF130)"/>
7878
<definition name="SUPPORTED_FF130_ONLY" displayName="$(string.SUPPORTED_FF130_ONLY)"/>
7979
<definition name="SUPPORTED_FF131" displayName="$(string.SUPPORTED_FF131)"/>
80-
<definition name="SUPPORTED_FF136_ONLY" displayName="$(string.SUPPORTED_FF136_ONLY)"/>
80+
<definition name="SUPPORTED_FF137_ONLY" displayName="$(string.SUPPORTED_FF137_ONLY)"/>
8181
</definitions>
8282
</supportedOn>
8383
<categories>
@@ -174,6 +174,9 @@
174174
<category displayName="$(string.ContentAnalysis_group)" name="ContentAnalysis">
175175
<parentCategory ref="firefox"/>
176176
</category>
177+
<category displayName="$(string.InterceptionPoints_group)" name="InterceptionPoints">
178+
<parentCategory ref="ContentAnalysis"/>
179+
</category>
177180
</categories>
178181
<policies>
179182
<policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
@@ -4311,28 +4314,28 @@
43114314
</policy>
43124315
<policy name="ContentAnalysis_AgentName" class="Both" displayName="$(string.ContentAnalysis_AgentName)" explainText="$(string.ContentAnalysis_AgentName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
43134316
<parentCategory ref="ContentAnalysis"/>
4314-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4317+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43154318
<elements>
43164319
<text id="String" valueName="AgentName"/>
43174320
</elements>
43184321
</policy>
43194322
<policy name="ContentAnalysis_AgentTimeout" class="Both" displayName="$(string.ContentAnalysis_AgentTimeout)" explainText="$(string.ContentAnalysis_AgentTimeout_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.Number)">
43204323
<parentCategory ref="ContentAnalysis"/>
4321-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4324+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43224325
<elements>
43234326
<decimal id="Number" valueName="AgentTimeout"/>
43244327
</elements>
43254328
</policy>
43264329
<policy name="ContentAnalysis_AllowUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_AllowUrlRegexList)" explainText="$(string.ContentAnalysis_AllowUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
43274330
<parentCategory ref="ContentAnalysis"/>
4328-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4331+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43294332
<elements>
43304333
<text id="String" valueName="AllowUrlRegexList"/>
43314334
</elements>
43324335
</policy>
43334336
<policy name="ContentAnalysis_BypassForSameTabOperations" class="Both" displayName="$(string.ContentAnalysis_BypassForSameTabOperations)" explainText="$(string.ContentAnalysis_BypassForSameTabOperations_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="BypassForSameTabOperations">
43344337
<parentCategory ref="ContentAnalysis"/>
4335-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4338+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43364339
<enabledValue>
43374340
<decimal value="1"/>
43384341
</enabledValue>
@@ -4342,14 +4345,14 @@
43424345
</policy>
43434346
<policy name="ContentAnalysis_ClientSignature" class="Both" displayName="$(string.ContentAnalysis_ClientSignature)" explainText="$(string.ContentAnalysis_ClientSignature_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
43444347
<parentCategory ref="ContentAnalysis"/>
4345-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4348+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43464349
<elements>
43474350
<text id="String" valueName="ClientSignature"/>
43484351
</elements>
43494352
</policy>
43504353
<policy name="ContentAnalysis_DefaultResult" class="Both" displayName="$(string.ContentAnalysis_DefaultResult)" explainText="$(string.ContentAnalysis_DefaultResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.ContentAnalysis_DefaultResult)">
43514354
<parentCategory ref="ContentAnalysis"/>
4352-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4355+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43534356
<elements>
43544357
<enum id="ContentAnalysis_DefaultResult" valueName="DefaultResult">
43554358
<item displayName="$(string.ContentAnalysis_DefaultResult_0)">
@@ -4372,14 +4375,14 @@
43724375
</policy>
43734376
<policy name="ContentAnalysis_DenyUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_DenyUrlRegexList)" explainText="$(string.ContentAnalysis_DenyUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
43744377
<parentCategory ref="ContentAnalysis"/>
4375-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4378+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43764379
<elements>
43774380
<text id="String" valueName="DenyUrlRegexList"/>
43784381
</elements>
43794382
</policy>
43804383
<policy name="ContentAnalysis_Enabled" class="Both" displayName="$(string.ContentAnalysis_Enabled)" explainText="$(string.ContentAnalysis_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="Enabled">
43814384
<parentCategory ref="ContentAnalysis"/>
4382-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4385+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43834386
<enabledValue>
43844387
<decimal value="1"/>
43854388
</enabledValue>
@@ -4389,7 +4392,7 @@
43894392
</policy>
43904393
<policy name="ContentAnalysis_IsPerUser" class="Both" displayName="$(string.ContentAnalysis_IsPerUser)" explainText="$(string.ContentAnalysis_IsPerUser_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="IsPerUser">
43914394
<parentCategory ref="ContentAnalysis"/>
4392-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4395+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
43934396
<enabledValue>
43944397
<decimal value="1"/>
43954398
</enabledValue>
@@ -4399,14 +4402,54 @@
43994402
</policy>
44004403
<policy name="ContentAnalysis_PipePathName" class="Both" displayName="$(string.ContentAnalysis_PipePathName)" explainText="$(string.ContentAnalysis_PipePathName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
44014404
<parentCategory ref="ContentAnalysis"/>
4402-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4405+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
44034406
<elements>
44044407
<text id="String" valueName="PipePathName"/>
44054408
</elements>
44064409
</policy>
44074410
<policy name="ContentAnalysis_ShowBlockedResult" class="Both" displayName="$(string.ContentAnalysis_ShowBlockedResult)" explainText="$(string.ContentAnalysis_ShowBlockedResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="ShowBlockedResult">
44084411
<parentCategory ref="ContentAnalysis"/>
4409-
<supportedOn ref="SUPPORTED_FF136_ONLY"/>
4412+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
4413+
<enabledValue>
4414+
<decimal value="1"/>
4415+
</enabledValue>
4416+
<disabledValue>
4417+
<decimal value="0"/>
4418+
</disabledValue>
4419+
</policy>
4420+
<policy name="ContentAnalysis_InterceptionPoints_Clipboard" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_Clipboard)" explainText="$(string.ContentAnalysis_InterceptionPoints_Clipboard_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Clipboard" valueName="Enabled">
4421+
<parentCategory ref="InterceptionPoints"/>
4422+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
4423+
<enabledValue>
4424+
<decimal value="1"/>
4425+
</enabledValue>
4426+
<disabledValue>
4427+
<decimal value="0"/>
4428+
</disabledValue>
4429+
</policy>
4430+
<policy name="ContentAnalysis_InterceptionPoints_DragAndDrop" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_DragAndDrop)" explainText="$(string.ContentAnalysis_InterceptionPoints_DragAndDrop_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\DragAndDrop" valueName="Enabled">
4431+
<parentCategory ref="InterceptionPoints"/>
4432+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
4433+
<enabledValue>
4434+
<decimal value="1"/>
4435+
</enabledValue>
4436+
<disabledValue>
4437+
<decimal value="0"/>
4438+
</disabledValue>
4439+
</policy>
4440+
<policy name="ContentAnalysis_InterceptionPoints_FileUpload" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_FileUpload)" explainText="$(string.ContentAnalysis_InterceptionPoints_FileUpload_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\FileUpload" valueName="Enabled">
4441+
<parentCategory ref="InterceptionPoints"/>
4442+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
4443+
<enabledValue>
4444+
<decimal value="1"/>
4445+
</enabledValue>
4446+
<disabledValue>
4447+
<decimal value="0"/>
4448+
</disabledValue>
4449+
</policy>
4450+
<policy name="ContentAnalysis_InterceptionPoints_Print" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_Print)" explainText="$(string.ContentAnalysis_InterceptionPoints_Print_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Print" valueName="Enabled">
4451+
<parentCategory ref="InterceptionPoints"/>
4452+
<supportedOn ref="SUPPORTED_FF137_ONLY"/>
44104453
<enabledValue>
44114454
<decimal value="1"/>
44124455
</enabledValue>

‎windows/fr-FR/firefox.adml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<string id="SUPPORTED_FF130">Firefox 130 ou supérieur, Firefox 128.2 ESR ou supérieur</string>
7676
<string id="SUPPORTED_FF130_ONLY">Firefox 130 ou supérieur</string>
7777
<string id="SUPPORTED_FF131">Firefox 131 ou supérieur, Firefox 128.3 ESR ou supérieur</string>
78-
<string id="SUPPORTED_FF136_ONLY">Firefox 136 ou supérieur</string>
78+
<string id="SUPPORTED_FF137_ONLY">Firefox 137 ou supérieur</string>
7979
<string id="firefox">Firefox</string>
8080
<string id="Permissions_group">Permissions</string>
8181
<string id="Camera_group">Caméra</string>

‎windows/ru-RU/firefox.adml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<string id="SUPPORTED_FF130">Firefox 130 или более поздние версии, Firefox 128.2 ESR или более поздние версии</string>
7777
<string id="SUPPORTED_FF130_ONLY">Firefox 130 или более поздние версии</string>
7878
<string id="SUPPORTED_FF131">Firefox 131 или более поздние версии, Firefox 128.3 ESR или более поздние версии</string>
79-
<string id="SUPPORTED_FF136_ONLY">Firefox 136 или более поздние версии</string>
79+
<string id="SUPPORTED_FF137_ONLY">Firefox 137 или более поздние версии</string>
8080
<string id="firefox">Firefox</string>
8181
<string id="Permissions_group">Разрешения</string>
8282
<string id="Camera_group">Камера</string>

0 commit comments

Comments
 (0)